* dispextern.h (struct it): Don't define OVERLAY_STRING_CHUNK_SIZE

twice.

* xdisp.c (handle_face_prop): Fix last change.

diff --git a/src/ChangeLog b/src/ChangeLog
index e0148b487ed34cd3020cd7fb98d785287a286c64..e0387a68723afcdec35444655d277a10201dbc4a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-07  Chong Yidong  <cyd@stupidchicken.com>
+
+       * dispextern.h (struct it): Don't define OVERLAY_STRING_CHUNK_SIZE
+       twice.
+
+       * xdisp.c (handle_face_prop): Fix last change.
+
 2007-11-06  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * gtkutil.c (xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and